Reduce formatting and repetition unittests/CppInterOp/CMakeLists.txt

Author: mcbarton

unittests/CppInterOp/CMakeLists.txt

@@ -9,6 +9,7 @@ if (EMSCRIPTEN)
 else()
   # Do not need main.cpp for native builds, but we do have GPU support for native builds
   set(EXTRA_TEST_SOURCE_FILES CUDATest.cpp)
+  set(EXTRA_PATH_TEST_BINARIES /unittests/bin/$<CONFIG>/)
 endif()
 
 add_cppinterop_unittest(CppInterOpTests
@@ -39,22 +40,16 @@ if(EMSCRIPTEN)
     LINK_FLAGS "-s MAIN_MODULE=1 -s WASM_BIGINT -s EXPORTED_RUNTIME_METHODS='[\"FS\",\"PATH\",\"LDSO\",\"loadDynamicLibrary\",\"ERRNO_CODES\"]' --preload-file ${SYSROOT_PATH}/include@/include -s ALLOW_MEMORY_GROWTH=1"
   )
 endif()
-  target_link_libraries(CppInterOpTests
-    PRIVATE
-    clangCppInterOp
-  )
 
-IF(EMSCRIPTEN)
-  set_output_directory(CppInterOpTests
-    BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}
-    LIBRARY_DIR ${CMAKE_CURRENT_BINARY_DIR}
-  )
-else()
-  set_output_directory(CppInterOpTests
-    BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/CppInterOpTests/unittests/bin/$<CONFIG>/
-    LIBRARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/CppInterOpTests/unittests/bin/$<CONFIG>/
-  )
-endif()
+target_link_libraries(CppInterOpTests
+  PRIVATE
+  clangCppInterOp
+)
+
+set_output_directory(CppInterOpTests
+  BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${EXTRA_PATH_TEST_BINARIES}
+  LIBRARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${EXTRA_PATH_TEST_BINARIES}
+)
 
 if(NOT WIN32)
   set_source_files_properties(VariableReflectionTest.cpp PROPERTIES COMPILE_FLAGS
@@ -69,11 +64,7 @@ export_executable_symbols(CppInterOpTests)
 
 unset(LLVM_LINK_COMPONENTS)
 
-if(EMSCRIPTEN)
-  add_cppinterop_unittest(DynamicLibraryManagerTests DynamicLibraryManagerTest.cpp ${EXTRA_TEST_SOURCE_FILES})
-else()
-  add_cppinterop_unittest(DynamicLibraryManagerTests DynamicLibraryManagerTest.cpp)
-endif()
+add_cppinterop_unittest(DynamicLibraryManagerTests DynamicLibraryManagerTest.cpp ${EXTRA_TEST_SOURCE_FILES})
 
 target_link_libraries(DynamicLibraryManagerTests
   PRIVATE
@@ -95,17 +86,10 @@ if(EMSCRIPTEN)
   )
 endif()
 
-IF(EMSCRIPTEN)
-  set_output_directory(DynamicLibraryManagerTests
-    BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}
-    LIBRARY_DIR ${CMAKE_CURRENT_BINARY_DIR}
-  )
-else()
-  set_output_directory(DynamicLibraryManagerTests
-    BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/TestSharedLib/unittests/bin/$<CONFIG>/
-    LIBRARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/TestSharedLib/unittests/bin/$<CONFIG>/
-  )
-endif()
+set_output_directory(DynamicLibraryManagerTests
+  BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${EXTRA_PATH_TEST_BINARIES}
+  LIBRARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${EXTRA_PATH_TEST_BINARIES}
+)
 
 add_dependencies(DynamicLibraryManagerTests TestSharedLib)