File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -32,13 +32,13 @@ set(DCMTKHTJ2K_HEADERS
3232
3333set (DCMTKHTJ2K_SRCS
3434 ${DCMTKHTJ2K_HEADERS}
35- djcodecd.cc
36- djcodece.cc
37- djcparam.cc
38- djdecode.cc
39- djencode.cc
40- djrparam.cc
41- djutils.cc
35+ libsrc/ djcodecd.cc
36+ libsrc/ djcodece.cc
37+ libsrc/ djcparam.cc
38+ libsrc/ djdecode.cc
39+ libsrc/ djencode.cc
40+ libsrc/ djrparam.cc
41+ libsrc/ djutils.cc
4242)
4343
4444if (MSVC )
@@ -113,9 +113,7 @@ install(
113113 Devel
114114)
115115
116- # Testing
117116option (BUILD_TESTING "Build the testing tree" ON )
118-
119117if (BUILD_TESTING)
120118 enable_testing ()
121119
Original file line number Diff line number Diff line change @@ -36,7 +36,7 @@ cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
3636 -DDCMTK_WITH_WRAP=OFF \
3737 -DBUILD_APPS=OFF \
3838 -DCMAKE_INSTALL_PREFIX=$OTS_DEV_SPACE /dcmtk/$BUILD_TYPE
39- cmake --build . --config $BUILD_TYPE
39+ cmake --build . --parallel $( nproc ) -- config $BUILD_TYPE
4040cmake --install . --config $BUILD_TYPE
4141
4242cd $OTS_DEV_SPACE
@@ -51,7 +51,7 @@ cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
5151 -DBUILD_SHARED_LIBS=OFF \
5252 -DOJPH_BUILD_EXECUTABLES=OFF \
5353 -DCMAKE_INSTALL_PREFIX=$OTS_DEV_SPACE /openjph/$BUILD_TYPE
54- cmake --build . --config $BUILD_TYPE
54+ cmake --build . --parallel $( nproc ) -- config $BUILD_TYPE
5555cmake --install . --config $BUILD_TYPE
5656
5757mkdir -p $BUILD_DIR
@@ -64,5 +64,5 @@ cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
6464 -DOPENJPH_DIR=$OTS_DEV_SPACE /openjph/$BUILD_TYPE /lib/cmake/openjph \
6565 -DDCMTKHTJ2K_ROOT=$OTS_DEV_SPACE /dcmtkhtj2k/$BUILD_TYPE \
6666 -DCMAKE_INSTALL_PREFIX=$BUILD_DIR_LIB
67- cmake --build . --config $BUILD_TYPE
67+ cmake --build . --parallel $( nproc ) -- config $BUILD_TYPE
6868cmake --install . --config $BUILD_TYPE
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
You can’t perform that action at this time.
0 commit comments