cmake fix

src/CMakeLists.txt

@@ -9,4 +9,4 @@ message("NO_OPENMP " ${NO_OPENMP})
 #set(CMAKE_INSTALL_PREFIX "${PROJECT_BINARY_DIR}/output" CACHE PATH "project install prefix" FORCE)
 set(CMAKE_COMMON_INC "${CMAKE_SOURCE_DIR}/../scripts/cmake_common.cmake")
 add_subdirectory ("${CMAKE_SOURCE_DIR}/VHACD_Lib")
-add_subdirectory ("${CMAKE_SOURCE_DIR}/test")
+add_subdirectory ("${CMAKE_SOURCE_DIR}/test")

src/test/CMakeLists.txt

@@ -2,10 +2,10 @@ project(VHACD_TEST)
 include(${CMAKE_COMMON_INC})
 
 if (NOT NO_OPENCL)
-	include(FindOpenCL OPTIONAL)
+	find_package(OpenCL QUIET)
 endif()
 if (NOT NO_OPENMP)
-	include(FindOpenMP OPTIONAL)
+	find_package(OpenMP QUIET)
 endif()
 if(OPENMP_FOUND)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
@@ -17,18 +17,16 @@ endif()
 add_executable(testVHACD ${PROJECT_CPP_FILES} ${PROJECT_C_FILES} ${PROJECT_INC_FILES} ${PROJECT_INL_FILES})
 
 target_include_directories(testVHACD PRIVATE ${CMAKE_SOURCE_DIR}/VHACD_Lib/public ${CMAKE_CURRENT_SOURCE_DIR}/inc)
+target_link_libraries(testVHACD vhacd)
 
 if (OpenCL_FOUND)
     include_directories("${OpenCL_INCLUDE_DIRS}")
     add_definitions( -DOPENCL_FOUND=1 )
+    target_link_libraries(testVHACD ${OpenCL_LIBRARIES})
 endif()
 
-IF(WIN32)
-target_link_libraries(testVHACD ${OpenCL_LIBRARIES} vhacd)
-ELSEIF(APPLE)
-target_link_libraries(testVHACD ${OpenCL_LIBRARIES} vhacd)
-ELSE ()
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall")
-target_link_libraries(testVHACD ${OpenCL_LIBRARIES} vhacd rt)
-ENDIF()
+if (NOT WIN32 AND NOT APPLE)
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall")
+   target_link_libraries(testVHACD rt)
+endif()