cmake fix - add correct library reference for tests and utils targets.

wdas · Mar 9, 2012 · 90bce5c · 90bce5c
1 parent 558bf33
commit 90bce5c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/src/ptex/CMakeLists.txt b/src/ptex/CMakeLists.txt
@@ -10,10 +10,10 @@ set(SRCS
     PtexUtils.cpp
     PtexWriter.cpp)
 
-add_library ( Ptex_static STATIC ${SRCS} )
-set_target_properties( Ptex_static PROPERTIES OUTPUT_NAME Ptex )
+add_library(Ptex_static STATIC ${SRCS})
+set_target_properties(Ptex_static PROPERTIES OUTPUT_NAME Ptex)
 
-add_library ( Ptex_dynamic SHARED ${SRCS} )
+add_library(Ptex_dynamic SHARED ${SRCS})
 set_target_properties(Ptex_dynamic PROPERTIES OUTPUT_NAME Ptex)
 
-target_link_libraries(Ptex_dynamic ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARIES} )
+target_link_libraries(Ptex_dynamic ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARIES})
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
@@ -1,14 +1,14 @@
 add_executable(wtest wtest.cpp)
-target_link_libraries(wtest Ptex)
+target_link_libraries(wtest Ptex_dynamic)
 
 add_executable(rtest rtest.cpp)
-target_link_libraries(rtest Ptex)
+target_link_libraries(rtest Ptex_dynamic)
 
 add_executable(ftest ftest.cpp)
-target_link_libraries(ftest Ptex)
+target_link_libraries(ftest Ptex_dynamic)
 
 add_executable(halftest halftest.cpp)
-target_link_libraries(halftest Ptex)
+target_link_libraries(halftest Ptex_dynamic)
 
 # create a function to add tests that compare output
 # file results

diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt
@@ -8,6 +8,4 @@ execute_process(COMMAND git describe ${PTEX_SHA}
 
 add_executable(ptxinfo ptxinfo.cpp)
 add_definitions(-DPTEX_VER="${PTEX_VER} \(${PTEX_SHA}\)")
-target_link_libraries(ptxinfo Ptex)
-
-
+target_link_libraries(ptxinfo Ptex_dynamic)