Merge pull request #145 from leochan2009/superbuild-findmodules

Superbuild findmodules Merged, waiting for feedbacks from other developers
openigtlink · Sep 8, 2017 · f3bef7f · f3bef7f
2 parents c1e962d + 17d9cf0
commit f3bef7f
Show file tree

Hide file tree

Showing 42 changed files with 1,165 additions and 794 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -38,22 +38,22 @@ before_script:
   - cd    build
 
 script:
-  - cmake -DOpenIGTLink_PROTOCOL_VERSION_3=ON -DBUILD_VIDEOSTREAM=ON -DLINK_VP9=ON ..
-  - make
-  - cd ..
-  - mkdir TestBuild
-  - cd TestBuild
-  - cmake -DCMAKE_PREFIX_PATH:PATH=../build -DBUILD_VIDEOSTREAM=ON -DLINK_VP9=ON ../Testing
+  - cmake -DOpenIGTLink_PROTOCOL_VERSION_3=ON -DOpenIGTLink_SUPERBUILD=OFF -DBUILD_VIDEOSTREAM=ON -DUSE_VP9=ON -DBUILD_TESTING=ON ..
   - make 
   - make test 
   #########################
   # Test for version2 build
-  - cd ../build
-  - cmake -DOpenIGTLink_PROTOCOL_VERSION_3=OFF -DBUILD_VIDEOSTREAM=OFF ..
+  - cmake -DOpenIGTLink_PROTOCOL_VERSION_3=OFF -DOpenIGTLink_SUPERBUILD=OFF -DBUILD_VIDEOSTREAM=OFF -DBUILD_TESTING=ON ..
   - make
-  - cd ../TestBuild
-  - cmake -DCMAKE_PREFIX_PATH:PATH=../build ../Testing
-  - make 
+  - make test
+  #########################
+  # Test for Super build
+  - cd ..
+  - mkdir SuperBuildTest
+  - cd SuperBuildTest
+  - cmake -DOpenIGTLink_PROTOCOL_VERSION_3=ON -DOpenIGTLink_SUPERBUILD=ON -DBUILD_VIDEOSTREAM=ON -DUSE_VP9=ON -DBUILD_TESTING=ON ..
+  - make
+  - cd OpenIGTLink-bin
   - make test
 
 
diff --git a/BUILD.md b/BUILD.md
@@ -62,7 +62,7 @@ Version 0.8.0 or newer is required, except Version 1.0.0.
 
 In the case of H265 build, H265 have many implementations, the encoder used in library is x265 and the decoder is OpenHEVC.
 OpenIGTLink library doesn't build H265 libraries, so the users need to download and compile the libraries by themselves. 
-Afterwards, set the variables-"X265_SOURCE_DIR, X265_LIBRARY_DIR, OPENHEVC_SOURCE_DIR, OPENHEVC_LIBRARY_DIR"-correctly in cmake configuration.
+Afterwards, set the variables-"X265_INCLUDE_DIR, X265_LIBRARY_DIR, OPENHEVC_INCLUDE_DIR, OPENHEVC_LIBRARY_DIR"-correctly in cmake configuration.
 
 * Linux / Mac OS X
 
@@ -77,7 +77,7 @@ $ make
 or for VP9 configuration:
 
 ~~~~
-$ cmake -DBUILD_VIDEOSTREAM:BOOL=ON -DLINK_VP9:BOOL=ON -DOpenIGTLink_PROTOCOL_VERSION_3:BOOL=ON ../OpenIGTLink
+$ cmake -DBUILD_VIDEOSTREAM:BOOL=ON -DUSE_VP9:BOOL=ON -DOpenIGTLink_PROTOCOL_VERSION_3:BOOL=ON ../OpenIGTLink
 $ make
 ~~~~
 

diff --git a/DartConfig.cmake → CMake/DartConfig.cmake b/DartConfig.cmake → CMake/DartConfig.cmake
diff --git a/GenerateOpenIGTLinkConfig.cmake → CMake/GenerateOpenIGTLinkConfig.cmake b/GenerateOpenIGTLinkConfig.cmake → CMake/GenerateOpenIGTLinkConfig.cmake
diff --git a/OpenIGTLinkConfigPlatform.cmake → CMake/OpenIGTLinkConfigPlatform.cmake b/OpenIGTLinkConfigPlatform.cmake → CMake/OpenIGTLinkConfigPlatform.cmake